From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 3 Aug 2018 00:54:21 +0000 (-0400)
Subject: Only use the portal color picker when appropriate
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~32^2~86
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7e74beec5b94254cb2bba8137e4e0569780d29ad;p=gtk%2B3.0.git

Only use the portal color picker when appropriate

This is just moving this check around.
---

diff --git a/gtk/gtkcolorpickerportal.c b/gtk/gtkcolorpickerportal.c
index 429c414f4b..da567ae0b9 100644
--- a/gtk/gtkcolorpickerportal.c
+++ b/gtk/gtkcolorpickerportal.c
@@ -18,6 +18,7 @@
 #include "config.h"
 
 #include "gtkcolorpickerportalprivate.h"
+#include "gtkprivate.h"
 #include <gio/gio.h>
 
 struct _GtkColorPickerPortal
@@ -52,6 +53,9 @@ gtk_color_picker_portal_initable_init (GInitable     *initable,
   GVariant *ret;
   guint version;
 
+  if (!gtk_should_use_portal ())
+    return FALSE;
+
   picker->portal_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                                         G_DBUS_PROXY_FLAGS_NONE,
                                                         NULL,
@@ -63,7 +67,7 @@ gtk_color_picker_portal_initable_init (GInitable     *initable,
 
   if (picker->portal_proxy == NULL)
     {
-      g_debug ("Failed to create screnshot portal proxy");
+      g_debug ("Failed to create screenshot portal proxy");
       return FALSE;
     }